From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 19 Sep 2012 02:34:49 +0000 (+0200)
Subject: screenShield: Delay destruction of unlock dialog
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5811
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=114f6f577f58;p=gnome-shell.git

screenShield: Delay destruction of unlock dialog

While the unlock dialog is created early so that it appears below
the shield while the curtain slides up, it is destroyed immediately
when the shield slides back in.
Keep it around until the shield is down instead.

https://bugzilla.gnome.org/show_bug.cgi?id=684342
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index c2e7cb651..96e2f80b0 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -648,9 +648,6 @@ const ScreenShield = new Lang.Class({
     },
 
     _onUnlockFailed: function() {
-        this._dialog.destroy();
-        this._dialog = null;
-
         this._resetLockScreen(true, false);
     },
 
@@ -701,6 +698,10 @@ const ScreenShield = new Lang.Class({
     },
 
     _lockScreenShown: function() {
+        if (this._dialog)
+            this._dialog.destroy();
+        this._dialog = null;
+
         if (this._arrowAnimationId)
             Mainloop.source_remove(this._arrowAnimationId);
         this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));